From 1986c5db15019a994528698651d176521f59fee4 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 11 Apr 2018 16:05:28 +0200 Subject: [PATCH] Process build configuration before resolving dependencies --- src/cargo/ops/cargo_compile.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index 27ba181ae..63372b279 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -259,6 +259,14 @@ pub fn compile_ws<'a>( bail!("jobs must be at least 1") } + let mut build_config = scrape_build_config(config, jobs, target)?; + build_config.release = release; + build_config.test = mode == CompileMode::Test || mode == CompileMode::Bench; + build_config.json_messages = message_format == MessageFormat::Json; + if let CompileMode::Doc { deps } = mode { + build_config.doc_all = deps; + } + let profiles = ws.profiles(); let specs = spec.into_package_id_specs(ws)?; @@ -340,14 +348,6 @@ pub fn compile_ws<'a>( } let mut ret = { let _p = profile::start("compiling"); - let mut build_config = scrape_build_config(config, jobs, target)?; - build_config.release = release; - build_config.test = mode == CompileMode::Test || mode == CompileMode::Bench; - build_config.json_messages = message_format == MessageFormat::Json; - if let CompileMode::Doc { deps } = mode { - build_config.doc_all = deps; - } - ops::compile_targets( ws, &package_targets, -- 2.30.2